Patch:    sdorig
Author:   Stephen Drake
Style:    Misc.
Comments: Various stuff.